2. Users
3. fidencio

Component unlocked 4 years ago

Repository rebased 4 years ago

Component locked 4 years ago

Component unlocked 4 years ago

Repository rebased 4 years ago

Component locked 4 years ago

Component unlocked 4 years ago

Repository reset 4 years ago

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Polish)
Using index info to reconstruct a base tree...
M	po/pl.po
Falling back to patching base and 3-way merge...
Auto-merging po/pl.po
CONFLICT (content): Merge conflict in po/pl.po
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Polish)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)

4 years ago

Component unlocked 4 years ago